Merge "Merge "Fix deadlock in KeyguardDisableHandler" into qt-dev am: 6cf5ea63eb am: 42c4a92560" into qt-r1-dev-plus-aosp
am: 6bfd0a508f

Change-Id: I8ecc0a456ce245d6d5e803a74cb3f7f29cc236b7