Merge changes I66d15781,I4568eb55 into main am: fdd6df043c am: db2765912b

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

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