Merge changes I2a437363,I27226885 into main am: 9636af27d2 am: 3c83e0b984 am: aa4efd26d3

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

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