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: 47ab967f

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



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