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

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

Change-Id: I9ddeafeacae76ecc4aa80eecd6503b2fea8378b9