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

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



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