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

Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e97 am: deeb5916 am: 88b5e80d

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



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