Merge "Completely detach old data stack" into tm-dev am: 6fb0937d9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17166935

Change-Id: I0f5541935a77da17a594f3209f835c5798ae5d4b