Merge changes I064786d2,I7bd56f60,I97c7cdce into udc-qpr-dev am: 68b5c004 am: 6944fcea

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



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