Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
am: 9f074e2224

Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe