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