Merge changes I293067bc,Iaf243153 into main am: 4f1e44609e

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

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