Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
am: d932268510
am: 88fc8f817a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503 Change-Id: I5866a3cc161292d1b146e8395ff92037a6937c68
This commit is contained in: