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: f6ef4bbd am: 1ed9ce19 am: 0e16b903

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



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