Merge "Update javadoc of CarrierConfigManager" am: 540d638718 am: e994932ccc am: 874d08f1b5

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

Change-Id: I61c08ea4c354e095ae0e19febb846ef8dea841e4