Merge "Fix javadoc typos in Color and Context" am: d153fa3f am: 9c6d82c5...

Merge "Fix javadoc typos in Color and Context" am: d153fa3f am: 9c6d82c5 am: 377f7e28 am: 85adf7b8 am: b1cfa080

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



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