Merge "Use a protected receiver for the keyguard delayed actions" into pi-dev am: 08d79be6bd
am: aaf08cf76e

Change-Id: I308b9bdb7e4c465c38f70be8cea12e5f48f757b7