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