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

Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5