Merge changes Id4db842d,I58e41d34 into main am: dcca938df5

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

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