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

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



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