Merge "Fix javadoc typos in Color and Context" am: d153fa3fe3

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

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