Merge changes Ica472482,I32381136 into main am: f4c7c30b8f

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

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