[automerger skipped] Fixed a race condition for early arrived PCO data am:...

[automerger skipped] Fixed a race condition for early arrived PCO data am: c7c07634 -s ours am: 47e53b05 -s ours am: 795aae39 -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: I61209a80b26af7986f06f4a6ef615127db5fa3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>