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