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

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



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