Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808

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

Change-Id: I7e165638f017aca678acf8a014b797534bc8a153