[automerger skipped] Merge "Improve nullability of CarrierPrivilegesTracker"...

[automerger skipped] Merge "Improve nullability of CarrierPrivilegesTracker" am: 34a07171 am: 1ca27138 am: 5b3dce61 -s ours am: c4043099 -s ours

am skip reason: Merged-In Ib6a7150750604c9115c00235b7a5e22c56e65012 with SHA-1 cf43c5fa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2036769

Change-Id: I17c1a8fff7af3f38c1806f1707f8ffd8eed79e97