Merge changes I603bbeee,I4e7f4072,Iafbfb65d,Ib6721b35,I152bd779 into main am: 5b9ae2f5ee am: 6c8c96c022 am: b8a031661c

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

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