[automerger skipped] Merge "Removed old data stack" am: fd1186a2 am:...

[automerger skipped] Merge "Removed old data stack" am: fd1186a2 am: 4e5d9c4a -s ours am: 299c6136 -s ours

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

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



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