Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: baf891b44b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044 Change-Id: I4921ba145ce81a7e39378af619f0e7c15e8ae4b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: