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