Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into...
Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2 am: c447d9ef
am: 0cbe2e1a
Change-Id: I98803fd185b5d523e5aec610d29c112ee78a6254