Merge changes from topic "move_contrast_api" into udc-dev am: 91f654bd am: 41bd8672

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



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