Merge "Revert "Optimized the boot up camping time"" into tm-qpr-dev am:...

Merge "Revert "Optimized the boot up camping time"" into tm-qpr-dev am: 813dca20 am: 089533b9 am: 2029a253 am: d8259737

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



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