Merge "Keyguard: Fix threading issues in KeyguardUpdateMonitor" into pi-dev am: b4e0b6413b
am: 909037f64f

Change-Id: I587724ec34c34db96ee1aefa0b7a81ffd892559b