Merge "Fix typo." am: 6b7318e25a am: 06b2898024

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

Change-Id: Ia26f0cb871a62a6e5219e05ed492fdf681d3f50f