Merge "Don't access keyguard from instant apps." into pi-dev am: e7bd4e7e8f
am: cbd47f7937

Change-Id: Ia58918ec4c66f9263ad7d0e27e74ae1b87402ba4