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

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

Change-Id: I4962b5c5b6413da5f7d47b8e430526b9209622b5