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

Change-Id: Ia6a7ec214dac0b1f45a1b6f62ccccd6d9988fe23