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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbf869ab140d3b5b97da0c0e53488eb340391d17