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

Change-Id: I524b8c1dcc44d075d2b0601b38d823cfa4cf90e5