Merge changes Ia8b00053,I98851ea9 into main am: f3ebcb0323

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

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