Merge changes from topic "am-e0e139b69a4045dea9dfeb19376e3714" into main am: fe77b206 -s ours

am skip reason: Merged-In I57f5f035a6ea7ac12e6fb6c619385af75defda2a with SHA-1 9f249a41 is already in history

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



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