Merge "Update the javadoc to correct weird formatting issue." into udc-qpr-dev am: 64261eba

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



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