Merge "Minor JavaDoc grammar fix" am: 86e1a45b56 am: fa264ae28b am: f1cbfa73ab

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

Change-Id: Ic147bc3d061f0906be7a74705414fe60c9aca0b9