Merge "Fix error in javadoc" into tm-dev am: 10ba4dab am: 327203d1 am:...

Merge "Fix error in javadoc" into tm-dev am: 10ba4dab am: 327203d1 am: 52cf6d8f am: 87cc006e

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



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