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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b0cbedae16e9efbc88521901cb225c1b5e64f58