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

Change-Id: Ia7b6297443c555edc9372e6991784b2a6920d2ba