[automerger skipped] Merge changes from topic "am-3df8766e1ce0494a933308cebf0c4031" into main am: 5f55630 -s ours am: c605d6c -s ours

am skip reason: Merged-In I53f25354804bd777ce20410edebe8e7d6a213061 with SHA-1 7c93509 is already in history

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

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

Author: android-build-merge-worker-robot