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: I9314481b4e03f2bc057637b89264919699a1fc7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>