Merge "Make LockTaskUtilityActivityIfAllowed direct boot aware" into sc-dev