Merge changes I2bfa04cc,I156f1032 into main am: 3fe61418c1

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

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