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: 7300ad78 am: 1bae7090

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



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