Merge "Fix typo." am: 32eb226956 am: b5a0ed6fce

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

Change-Id: I09b77744103991253ea60b13d6797916bb8409f6