Merge "Fix typos found by linter" into main am: 407ba05ccb am: 61fc070c25

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

Change-Id: I78ecc71f7d1b515054198d862120ec018a69c5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>