[automerger skipped] Merge "Add SATELLITE_COMMUNICATION to Settings app and...

[automerger skipped] Merge "Add SATELLITE_COMMUNICATION to Settings app and fix checkcolor_hook" into 24D1-dev am: 9c5ce017 -s ours

am skip reason: Merged-In I117dab50b8157e2f81de7b1ff6998c45fb84c734 with SHA-1 06562e0f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784704



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