Merge "fix common typos as part of codelab" into main am: 4cb35da81e am: 0cfbb3aa6f

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

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