[automerger skipped] Fixed a race condition for early arrived PCO data am: c7c07634 -s ours

am skip reason: Merged-In Id54258d03d63e77866a54e394822d38898ae61a3 with SHA-1 233a9f39 is already in history

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



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