Merge changes Ib9a1af0c,I807496ec into main am: 010049c6 am: 00423583 am:...

Merge changes Ib9a1af0c,I807496ec into main am: 010049c6 am: 00423583 am: 823f5e12 am: b08bf10e am: 72883234

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>