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