Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf am: a467f9dcba am: 4872c85344 am: 6f2c137f85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381 Change-Id: If20e8177816335763cca686761f6f2b2121ba33b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: