Merge "Fix typo" am: a31dc6da2a am: b19c821215

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

Change-Id: I1d66400e8a09fdc4deaee75313f900a3306e695f