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

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

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