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

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



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