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: 5f9b47ee am: 59664245

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



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