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

[automerger skipped] Merge "Combine data roaming from user action into one preference" into tm-qpr-dev am: 8b50b375 am: 641df17d -s ours

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

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



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