Merge "Merge changes Ibf61fe8f,I127e1a2c into udc-dev am: fccfd4de am:...

Merge "Merge changes Ibf61fe8f,I127e1a2c into udc-dev am: fccfd4de am: aab760ad" into udc-d1-dev-plus-aosp am: f2ca36c3

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



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