Merge "Erase data stored in SharedPreference during factory reset" into sc-dev am: 02b22da3b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/13855172

Change-Id: I832b547ee68c99b51994a6f3d91f0c8d9c43d420