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

[automerger skipped] Move dataEnabled override rule check to phone switcher am: 086a851a -s ours am: e986e098 -s ours am: d93c6979 -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: I6cbb81c3090d59716a84be4961a46bab238f3344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>