Merge changes I62db2bc4,I20f13fd3 into main am: cb17d91035 am: 32762620ea

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

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