[automerger skipped] Merge "Expose carrier privilege rules certificates as...

[automerger skipped] Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d16 am: 1819888b am: faf48c00 -s ours

am skip reason: Merged-In I942d4c0c7c786d7c8b561e5e65773367cefffb31 with SHA-1 5bf8a843 is already in history

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

Change-Id: Iee54e3eeafc0c15af6dfda4c6ad37addd850b813