[automerger skipped] Improve data set up time am: 8e670057 -s ours am:...

[automerger skipped] Improve data set up time am: 8e670057 -s ours am: 13a9323d -s ours am: 3fd7f1f1 -s ours am: 21401e1e -s ours am: 09c4da3b -s ours

am skip reason: Merged-In Ie97cf66fd0b38c7f4bed5360cf2a381f1bf56140 with SHA-1 e5e9790f is already in history

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



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