Merge "Fix typo" am: 4c6f7f9d08 am: 2e7720e0f4

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

Change-Id: I83ae03c08dbd38e285d648458a7fb74319b57a78