Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev
am: 6cf5ea63eb

Change-Id: I0fe67a4ad6e6a2598123662de4f543735b78ceb9