Merge changes I2a437363,I27226885 into main am: 9636af27d2

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

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