Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am: f044e0b8 am: fcc7a555" into oc-dr1-dev-plus-aosp