Merge changes I78dd3268,I8ce35a82 into main am: b9153aa958 am: 550220affd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2922538

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