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

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



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