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

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

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