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

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



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