[automerger skipped] Merge "Removed old data stack" into tm-qpr-dev-plus-aosp...

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

am skip reason: Merged-In I2845a04bf9f1dd74f574c14bc951467235d1512a with SHA-1 970b2836 is already in history

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



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