Merge "Fix typo." am: 90a56ebcbb am: dc9d27af50 am: bfc1749363

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1910817

Change-Id: Ibaa2241a2131df435866799a2aeeb5e4c0682901