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

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

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