Merge "Fix javadoc typos in Color and Context" am: d153fa3fe3 am: 9c6d82c50c am: 377f7e286e

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

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