Merge "Improve Logic for Detecting Carrier Load Complete" am: b6a60e4420 am: 46e8235a4e am: 3822136986

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1558467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2b79af28d384e3b6f6f95914e796bffc08598e6