[automerger skipped] Merge "Move dataEnabled override rule check to phone...

[automerger skipped] Merge "Move dataEnabled override rule check to phone switcher" am: 084afdff -s ours am: 87a21d83 -s ours am: 33742baf -s ours

am skip reason: Merged-In I8ea07a1ed879afd52d960241b40e8a4897f899aa with SHA-1 340c7076 is already in history

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



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