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

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



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