Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c7546 am: b78ad69fa0 am: 9378d318f4 am: 13b24677c2

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

Change-Id: I426f2f418a371a60a5ed6bf752190536d35dd5c6