Frameworks/base: move custom string in cm_strings.xml file

Change-Id: I1ae0add981ed72a89e64b687210647d69a09ea3e
QS: Unlock screen when tap profile tile

Change-Id: Ie6d343bffd41c268e46a714b301338fc6bbba32d
JIRA: CYAN-1888
Issue: https://jira.cyanogenmod.org/browse/CYAN-1888
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge "QS: Unlock screen when tap profile tile" into cm-10.2
Merge "Frameworks/base: move custom string in cm_strings.xml file" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2