Merge changes Ia8b00053,I98851ea9 into main am: f3ebcb0323 am: c01f9663fb

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

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