Merge changes from topic "am-04d816e94b23473b80bda9238351c36b" into...

Merge changes from topic "am-04d816e94b23473b80bda9238351c36b" into udc-qpr-dev-plus-aosp am: c2ce6efd -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d9e0d0ad is already in history

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



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