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

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



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