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

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



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