Reverted ag/16684151

The change for 5G+ PCO is a temporary workaround for S-QPR2. Revert
here so we can have a proper fix on T.

Bug: 211682727
Test: Build
Merged-In: I5211c499628dc0d027669ed5a0e52a9091084a89
Change-Id: If9623ce50d70346c25f3d308e333f347e5c721c3
2 files changed