Merge "Fallback if the preference is already changed" into sc-dev am:...

Merge "Fallback if the preference is already changed" into sc-dev am: 5be46018 am: 77a3a745 am: deaefd5d

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

Change-Id: Ifdfa96280eed1bd27d5237a03f6bcf808451ce8e