Merge changes from topic "ic-android14" am: d65b6dc2

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



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