Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6e am:...

Merge "ColorSpace.java,cosmetics: fix some typos" am: 65240d6e am: cd3bbf1e am: 9b2f7df4 am: 6d46535c

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



Change-Id: I860fb8584929496adad4a44ecbb04d6b42ca532c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>