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

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



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