[automerger skipped] Merge "Removed old data stack" am: 8346328514 am: 63243bdd2f -s ours am: af88e7c574 -s ours

am skip reason: Merged-In If58601f251dfdea8e38952be456fdabb54fcab2c with SHA-1 d7b8d37dab is already in history

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

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