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

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

Change-Id: Iefbd1aaaa93898d3c077721fceb131bfc106b89f