[automerger skipped] Persist user data roaming settings am: 4fee4095 -s ours...

[automerger skipped] Persist user data roaming settings am: 4fee4095 -s ours am: e5bfdc6c -s ours am: 64076383 -s ours am: 6e10dcc9 -s ours

am skip reason: Merged-In I247f782936bf7f83e3db89c2be2b1086e4b899ba with SHA-1 3027f55d is already in history

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



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