Merge changes Ib9a1af0c,I807496ec into main am: 010049c665 am: 0042358300 am: 823f5e121e am: b08bf10ed3 am: 7288323448

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

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