Merge "Take a moment for the LockTaskUtilityActivityIfWhitelisted to ready." into oreo-mr1-cts-dev