Merge changes I98f1319d,Ic15fe28f into main am: e901af4aaa am: 18f247a58d am: f7d2e064a3

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

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