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

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



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