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: 4057c621

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



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