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 branch 'cm-11.0' into kk_mkt

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: I0e1751e5f285ac4966b5e0716461c9020b219bf2
Revert "Settings: Move CM stats to privacy, organize."

This reverts commit 1adb5406fdbe4d6d351e2fcba94d44a2189eb5b1.

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: I2306595d3675ffa29d74f35b98a517107b3339ac