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

Change-Id: I96db2a0bf55871df53f6f7220bac2cdd262cee4b