Merge "Fix typo in Javadoc." am: 302d0925da am: a51258f289

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

Change-Id: I0ec0df0341e1bfd6cdab1b7fbca7bbaf2abb55d0