Merge "Removed old data stack" am: 8346328514

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

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