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

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

Change-Id: Ifdaed83a7696ad37df0487a91bcb089de229de07