Merge "Fix typo in comment." am: 182e90d1ea am: 2a0adcf0c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314a3e97c4683dddb0ced5f5368e01586eea9919