Merge changes I48490112,I4227ce3f,I020a2803 into main am: abb750fe27 am: f971721ed7

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

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