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

Change-Id: Ie932cc3972ca2a77bffe2da26c3786183f81b591