Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d65 am: 7c53d299 am: 1db4bc36

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044



Change-Id: Ie88d511f8c1fb4047a62425e49cd2b120062b5f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>