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

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



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