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

[automerger skipped] Move dataEnabled override rule check to phone switcher am: 340c7076 -s ours am: 5a596c34 -s ours am: 49a8fd5b -s ours

am skip reason: Merged-In I8ea07a1ed879afd52d960241b40e8a4897f899aa with SHA-1 4622c39d is already in history

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



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