Merge "instant apps don't have access to the KeyguardManager" into sc-dev