Merge "Fix the typos on the java doc" am: 63fed23659 am: ae0939cf4a am: 828571b9c0

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

Change-Id: I5f176959b92da59ca489e75504b7ecfa49ec8604