Merge "Query for the settings package in KeyguardManager instead of hardcoding it. am: e256a18dcd am: 11bdbd1145 am: 52b8412742"