[automerger skipped] Merge changes Id1b0d965,I331f8ff6 into 24D1-dev am: b21d60ac -s ours

am skip reason: Merged-In Id1b0d9656b79180bf5489a848721ab4caa289c68 with SHA-1 838626ec is already in history

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



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