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

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

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