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

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



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