Merge changes I4dc1263b,Ie147ab00 into main am: 19183730c8

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

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