[automerger skipped] Merge "Add unit testing for CarrierPrivilegesTracker."...
[automerger skipped] Merge "Add unit testing for CarrierPrivilegesTracker." am: 8318d158 am: 80d055d4 -s ours
am skip reason: Change-Id I179c89d6cb3c955f02aa26159bb9eb74d43a198a with SHA-1 7702d6eb is in history
Change-Id: I49edd1560184b73ac9edfc49ca7278c154f6b1d6