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

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

Change-Id: If19e70d11c7c19724fc207b5d9e0133a8da2222f