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

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

Change-Id: Ibd363225fbbe0d858aad27623d5522da4dec5291