Merge "Only disallow data when device in CDMA ECBM" into tm-dev am: 3c87a790

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



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