Merge changes I89c9b0f4,Id8748b58 into main am: 3dc564c83d am: f79e0b2b72

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

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