[automerger skipped] Merge changes from topic "satlog" into 24D1-dev am: 50d756f7 -s ours

am skip reason: Merged-In I9fc8ff97385299dde6ac457983e85dd51ba00b54 with SHA-1 86d8f6b1 is already in history

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



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