Merge "Fix typo" am: 6b5e6bba9b am: f3fcd261ee am: afa759cd3e

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

Change-Id: I4314a44429c15068058251d52d3cfaa34e3213b5