Merge changes I2bfa04cc,I156f1032 into main am: 3fe61418c1 am: 425caa8557

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

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