Merge changes from topic "am-807850e6181c4a3bbdb34ab53eee15ad" into...

Merge changes from topic "am-807850e6181c4a3bbdb34ab53eee15ad" into udc-qpr-dev-plus-aosp am: 23c3f995 -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: Iec5a1e738c7f88710fc5f8962a4f2d234cc04dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>