[automerger skipped] Fixed a race condition for early arrived PCO data am: 233a9f39 -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/+/19534835



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