[automerger skipped] Merge "Completely detach old data stack" am: 0da44a9e am: 8514aa74 -s ours

am skip reason: Merged-In I275aa53a5102f00123f2429c22f31d8212b83377 with SHA-1 12132584 is already in history

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



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