[conflict] Merge "New data stack wait for data disconnected on all subs for...

[conflict] Merge "New data stack wait for data disconnected on all subs for APM on" into tm-d1-dev am: fcd16a7e

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



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