Merge changes I8555310a,I3d3bcfa3 into main am: 382fc4d2e8 am: ae1a360c8e

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

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