[automerger skipped] Merge "Moved 5G+ PCO related code to data modules" am:...

[automerger skipped] Merge "Moved 5G+ PCO related code to data modules" am: 91735689 am: bffbcee8 am: 633c51e2 -s ours am: 7794cd47 -s ours

am skip reason: Merged-In I45e453b0cc497d69b85a77855d8c62b52b2e5441 with SHA-1 b5d1ea7a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2032904

Change-Id: Ie669fa09fa1754589d44a30777278000f20c7578