Merge changes I2a437363,I27226885 into main am: 9636af27d2 am: 706b154396 am: 01f261380d

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

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