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

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

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