Merge "Update javadoc for CARRIER_ID to be used to match carrier info" into udc-dev am: b6af8a78

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



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