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