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 am: 51f4249e

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



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