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

[automerger skipped] Move dataEnabled override rule check to phone switcher am: 4622c39d -s ours am: 743d56e9 -s ours

am skip reason: Merged-In I8ea07a1ed879afd52d960241b40e8a4897f899aa with SHA-1 8a49acbf is already in history

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



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