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

Change-Id: I221b89a01108e1d932a612f45b81798cebbaf66b