Merge changes from topic "am-3df8766e1ce0494a933308cebf0c4031" into main am: 5f556302 -s ours

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

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



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