[automerger skipped] Merge changes from topic "2024-09-raven-aosp-cherry-pick"...

[automerger skipped] Merge changes from topic "2024-09-raven-aosp-cherry-pick" into main am: 3d7c275c am: faf1c6ff -s ours

am skip reason: Merged-In I1e8220af5e084518aedb85cd33b597d89443b62a with SHA-1 79f29ea8 is already in history

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



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