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

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

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