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

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



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