Merge "Delay data switch untill call alerting" into udc-qpr-dev am: c82807bb

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



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