Merge "Fix failing checkcolor_hook in Settings" into udc-dev am: cebb5582 am: 2a91abd1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21850207



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