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

Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277