Merge changes I8555310a,I3d3bcfa3 into main am: 382fc4d2e8

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

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