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

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

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



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