Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c7546

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

Change-Id: I3274da8750b5df89c1171cfa97827a7f64e140cb