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

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

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



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