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

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

Change-Id: I933a3bba4bf54759c015772455372be3a2ab64f1