Merge "Delay data setup after call end" into tm-dev am: 5d102efd am: 9530e280

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



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