[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L69100000963689907:N98600001416520494" into main am: 373a2527 -s ours am: f144c217 -s ours am: 9e4a028f -s ours

am skip reason: Merged-In I8a3565a827fe183997573f685110805e5b5bc306 with SHA-1 ada1a2a3 is already in history

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



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