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

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

Change-Id: I7329e0d486e11d06f7df9325b3d53824bd5514e2