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