Merge "Fix a minor javadoc issue" into tm-qpr-dev am: 80e6ca39

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



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