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

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

Change-Id: Ice8ba1ec23148479a5faa9106b0940c89f0b0363