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

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



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