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

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

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