Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0
am: 01149077d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405 Change-Id: I228f5180779e4a3c658717e4d92c0310cadeac56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: