Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e97 am:...

Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e97 am: 80112c15 am: ae541c2e

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



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