[automerger skipped] Merge "[Telephony] Add more javadoc for carrier...

[automerger skipped] Merge "[Telephony] Add more javadoc for carrier privileges" am: 210da8ce am: 4b305912 am: 58337991 am: 8a19d66f am: 1904329b -s ours

am skip reason: Merged-In I9f43b7ba2e0184d48149a3496559a4be6d07cf6a with SHA-1 209885b6 is already in history

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

Change-Id: I3a42980bda9c2e957209f07814060e8c0f76a6c5