Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev