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

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



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