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