Merge "Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7e2 am: d0c5f0047f am: 7a86073718"