Merge "Allow data setup when oos if voice is registered" into tm-dev am:...

Merge "Allow data setup when oos if voice is registered" into tm-dev am: d83d70bd am: 6337733d am: 0c182564 am: 8497f140

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



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