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