Merge changes I62db2bc4,I20f13fd3 into main am: cb17d91035

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

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