Merge "Update CUJ_SCREEN_OFF_SHOW_AOD to use new clockId source" into main