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

Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d65 am: f7b82efb am: c2ddd3e5 am: b1c85416

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



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