Merge changes I064786d2,I7bd56f60,I97c7cdce into udc-qpr-dev am: 68b5c004f9

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

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