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 am: cf5b2ee2

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



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