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

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



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