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

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

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

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



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