Merge "Fix error in javadoc" into tm-dev am: 10ba4dab am: 327203d1 am: 84b6119c am: 084ca0e5

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



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