Merge "Completely detach old data stack" am: 408f76de6e

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

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