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

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



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