Settings: add TEME_SETTINGS intent and SHORTCUT category to
ThemeSettings intent

Change-Id: Ie5d8c401adc612502ff1db27fa4861a27d876a41
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge "Settings: add TEME_SETTINGS intent and SHORTCUT category to ThemeSettings intent" into cm-11.0
Settings: Move CM stats to privacy, organize.

Change-Id: Ibb7acc3584474bbc0e496d0983fa6f2b9d335162
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: I7a61b54ce6829ced6b39de50254c55aeb8f4ea99