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

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

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



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