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

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

Change-Id: I6023e92cb9c6b338f96fbb85c9df51b81286e0a1