[automerger skipped] Merge "Completely detach old data stack" am: 408f76de6e am: 794807a3d9 -s ours

am skip reason: Merged-In Ie5a600eeca123c15845cedeb4dded4792752ea93 with SHA-1 6f3707cf5d is already in history

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

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