[automerger skipped] Merge "Inverted the new data stack flag" am: a74f7c42...

[automerger skipped] Merge "Inverted the new data stack flag" am: a74f7c42 am: e088837f -s ours am: 17168662 -s ours

am skip reason: Merged-In I3513de313260bd2273add89ac47fdab3406be891 with SHA-1 7dd6d1b3 is already in history

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



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