Merge "[Telephony] Add more javadoc for carrier privileges" am: 210da8ceef am: 4b3059129b

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

Change-Id: If0e631820c1fb13a48eb74cef7be9251743c746d