[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-d1-dev am: fcd16a7e -s ours am: 0d6a0a3e -s ours am: cdf5defc -s ours

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

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



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