Merge changes from topic "am-4cd350e8fb67414d90bad54bd1a99743" into main am: eb82879b -s ours

am skip reason: Merged-In I02deca58bfd9a2cf169c2e58995cc42eeb854c8d with SHA-1 03ceb6d3 is already in history

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



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