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