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

Merge changes from topic "am-db801d2101f744bba791ae3c7a8cc342" into tm-qpr-dev-plus-aosp am: 72291057 -s ours

am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 b4a2d3a7 is already in history

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



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