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

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

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