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: 8d1bae18 am: 16423c6c

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

Change-Id: I644e6032e95a2bdd082c9ec6e95d68b861b4f327