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

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

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