Merge changes Id4db842d,I58e41d34 into main am: dcca938df5 am: d14a113236

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

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