Merge changes I98f1319d,Ic15fe28f into main am: e901af4aaa

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

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