Merge changes Iaf1ecb67,Ifdc84b17,I1480b734,I2857cd33 into udc-dev am: 03081ace47 am: 3ff29df4e0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22692503

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