Merge changes I1e6c3c80,I4310618c into main am: 5a2065886b

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

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