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

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

Change-Id: I44eec10939863f6e15c907427d4c9acba0a43b28