[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" am: b2f30408 am: 4ad74f5c -s ours

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

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



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