Merge changes Iac799d37,Ibf88d68c,Id396b0e2 into main am: 1d7e1458b9 am: f5869c9252

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

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