Merge "Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63 am: 42c4a925" into qt-r1-dev-plus-aosp