Merge "Query for the settings package in KeyguardManager instead of hardcoding...
Merge "Query for the settings package in KeyguardManager instead of hardcoding it." into cw-f-dev am: 8ac1bff7 am: 20d79203
am: 60e03c36
Change-Id: I5790f4748bf2b3f09b4d2efb66ecba117d289844