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