Merge changes I1e6c3c80,I4310618c into main am: 5a2065886b am: 3150c9697c

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

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