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