Merge changes from topic "tc_change_23022120_23" into udc-dev am: 1e410e7a11 am: 34a75bf63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517269 Change-Id: I762dddfb6584c2c783949e0b5219274b274064c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: