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

Change-Id: If7518fe10c48f2328af8dce4162eeaf2c7be7995