Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: b52b6f6d46 am: 39c6a23f92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917 Change-Id: I0ee232d3ec014fbdcb7d92b753aa2fe0844103c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: