Merge "Persist user data roaming settings" into tm-dev am: 58e99de2 am:...

Merge "Persist user data roaming settings" into tm-dev am: 58e99de2 am: d124f049 am: ea34ce53 am: 3e511aa9

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



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