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

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

Change-Id: I6d13a651c30c693ebbbb4c97fe3f341253c8e22b