Merge "Ims provisioning storage in AOSP" am: 7d7296e071

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

Change-Id: Ibbcaacc7fbc863365bfc77b19b434eff404a09f9