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

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

Change-Id: I084659f9f874fd7654645043c31e6f5e2b7a04de