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

Merge "Fix some obvious typos and copy-paste bugs." am: 1cfd0c75 am: b78ad69f am: 9378d318 am: 13b24677

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

Change-Id: I426f2f418a371a60a5ed6bf752190536d35dd5c6