[automerger skipped] Merge "New data stack wait for data disconnected on all...

[automerger skipped] Merge "New data stack wait for data disconnected on all subs for APM on" into tm-dev-plus-aosp am: 55535e4b -s ours am: 0283a1d3 -s ours

am skip reason: Merged-In I12d7b67236bccbfa6fee4cb21c6dc91bb45e6ebc with SHA-1 fc613325 is already in history

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



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