Merge "Fix a typo in a comment" am: 0e10d126a3 am: bcc6e4f4e6 am: 9b1db6b4db

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

Change-Id: I8428419ef645a312c7fbbc45a8ac5709d6ab5d9c