[automerger skipped] Merge "Update javadoc of the newly introduced CarrirConfigManager APIs" am: 756cf6254c am: c7bed0856f am: 3a853c8649 -s ours
am skip reason: Merged-In I0f5593f8b5ba54bcd679be26a9a8db31ac33b461 with SHA-1 afc9665161 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2478139
Change-Id: If04b37e2fdddc9198c417cf07309e7a085b0d687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: