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

Change-Id: I864542fa90dc51ee16b815eb414cdf01fd6370b5