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

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

Change-Id: I76f77886cdf207d9939849009e80b2d20bafcc76