[automerger skipped] Removed old data stack am: b38ac04a -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: Ic48ace1eac44470f6a75768befd2f946a0a47f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>