Merge "Fix a minor typo." am: ffd7fdeba1 am: a6fa6fd808 am: 1106a7e692 am: eecca5adf0

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

Change-Id: Ia03503f0ee1e3671ea090e08f29a2294eae692fe