[automerger skipped] Merge "Add carrier config nr_advanced_capable_pco_id_int" am: e5facf4298 am: 1e3ee547dc -s ours am: 9c67977f99 -s ours am: 111a521fca -s ours
am skip reason: Merged-In I241700232325cc852c363e8efe567e14cfc7e0aa with SHA-1 6c1f38e18d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1731572
Change-Id: I30dec1ee0fc6caf0c4ac46d4058b3c7c1bbba2da
This commit is contained in: