[automerger skipped] Merge changes from topic "bug-327210346" into 24D1-dev am: 007a5c71 -s ours

am skip reason: Merged-In I4790009e36becc0dcce9652f0d6f7a80465ab03d with SHA-1 8ddcd1cf is already in history

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



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