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

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

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