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

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

Change-Id: I0e23b657653bed588cb2b8f50ad99b0c429d4468