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

Change-Id: I4f63e45d4cb22d617e88151bb1419531b0fd2c57