Merge "Fix common typos" into main am: a775593c9e am: 5ddf8a159b

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

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