[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L69100000963689907:N98600001416520494" into main am: 373a2527 am: 62ae666d -s ours am: 3e601786 -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: Ib6829075056097840b98393f52328b9741c67195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>