Merge changes Ica472482,I32381136 into main am: f4c7c30b8f am: 3f1086d916 am: 1ff3c08bee

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

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