Merge "Improve data set up time" into tm-qpr-dev am: 92189452

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



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