Merge "Provide content description for WorkLockActivity." into oc-dev
am: f044e0b87f

Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e