Merge "Fixed typo in class description." am: 9f59ca04 am: 5376d1ac am:...

Merge "Fixed typo in class description." am: 9f59ca04 am: 5376d1ac am: 4a1d3071 am: 3f3bdc48

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



Change-Id: I4bee6fcddba7c4917816e38f59752fcc54fd398b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>