[automerger skipped] Merge "Introduce CarrierPrivilegesCallback to replace CarrierPrivilegesListener" am: cabb6b9362 am: 592bab637d am: 72f706f60a -s ours
am skip reason: Merged-In I38d03e3921112c313f3c1d204ed04f6e1756ff39 with SHA-1 5f0502d313 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2037268
Change-Id: I086b8fd0ad2e476e21563927386ee61fc8c819c4
This commit is contained in: