Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a am: 1819888bfb

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

Change-Id: I03d4f77bd168d642e2fa2514beb3fc2033cd39cf