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

Change-Id: I5d5d8ea0c7b5756143b5140e4cf16ae584147345