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

Change-Id: I95804c928e0baced524d1d8f75bed1fae68e7568