Merge "Combine data roaming from user action into one preference" into tm-qpr-dev am: 8b50b375

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



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