Merge changes I66d15781,I4568eb55 into main am: fdd6df043c

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

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