[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 am: 381cea5a am: 1d379d8d

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



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