Merge changes Ieca708fe,Ic1647135 into main am: b66c611205

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

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