Merge "Merge changes I58a9c06b,I08bedeca into udc-dev am: 83f861dc am:...

Merge "Merge changes I58a9c06b,I08bedeca into udc-dev am: 83f861dc am: ca38aa1f am: a759d971" into udc-qpr-dev-plus-aosp am: 33e74aa2

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



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