Merge "Remove dangling javadoc" am: 6d61168c0d am: 9b13491142

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

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