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

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

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