[automerger skipped] Merge aosp-24Q3-ts-dev am: 4a8624d7 -s ours

am skip reason: Merged-In I531676195e674e2ce52632e5bae6c93fc1d5e1d0 with SHA-1 98cbbae5 is already in history

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



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