Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf8

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



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