Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev am: 15e2d7e50b am: e0047318d6
am: 92bee05891

Change-Id: I12be3d657748c6d82e4a8776bce91c6f2876e13b