Settings: Make settings searchable.

Signed-off-by: Adnan Begovic <adnan@cyngn.com>
Signed-off-by: Danesh Mondegarian <danesh@cyngn.com>
Change-Id: Ic06dca33bf8fd0ef8f63f51e131b70fe730cb7c5
Merge remote-tracking branch 'CM/cm-11.0' into cm-11.0-beta

Conflicts:
	AndroidManifest.xml

Change-Id: I7c2538f9d9e668081526a51dd19b5321fe949655