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

[automerger skipped] Fixed a race condition for early arrived PCO data am: 315bc648 am: 99f6e78b -s ours am: 628eb713 -s ours am: 0a8cf3a4 -s ours

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

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



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