Merge "Update javadoc of the newly introduced CarrirConfigManager APIs" am: 756cf6254c am: c7bed0856f

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

Change-Id: I894de000b1de8228ed5229b1750aa22de972c9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>