Merge changes from topic "am-ee7a131dd37340639861d9fe18545800" into...

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