Merge "fix common typos" into main am: c3c542b5

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



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