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

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



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