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