Merge "Remove dangling javadoc" am: 6d61168c

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



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