Merge "Updating Satellite Mode Key in Settings" into udc-dev am: b7ff375b...

Merge "Updating Satellite Mode Key in Settings" into udc-dev am: b7ff375b am: ef6a89e9 am: b916cf14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22434785



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