[automerger skipped] Merge "[SB][Sat] Add carrier text logs, make device-based...

[automerger skipped] Merge "[SB][Sat] Add carrier text logs, make device-based sat VM a singleton." into 24D1-dev am: 00cc26af -s ours

am skip reason: Merged-In I96bf9de1248e25a8d32e8440c161db2508a91eff with SHA-1 996bf18e is already in history

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



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