[automerger skipped] Combine data roaming from user action into one preference...

[automerger skipped] Combine data roaming from user action into one preference am: 50474562 -s ours am: b9db4149 -s ours am: 4272b97e -s ours

am skip reason: Merged-In Id73e66b2fd96a367ff469b464bf01bedddf6fdd3 with SHA-1 ee41716c is already in history

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



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