Merge "Fix some syntax errors in javadoc" am: 79605eb9 am: 72ca88f7

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



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