[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 33be5720 -s ours

am skip reason: Merged-In I6a09853074efaddcac7f8bcee26d16b44454928a with SHA-1 56d743ea is already in history

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



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