Merge changes I293067bc,Iaf243153 into main am: 4f1e44609e am: 0fe7f9e690

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

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