Merge "Update Javadoc to clarify format for country ISO." into udc-dev am: f9a43c05a0 am: 3fc956779a

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

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