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

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



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