[automerger skipped] Merge "Removed old data stack" into tm-qpr-dev-plus-aosp am: e36ae39f67 -s ours

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

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

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