Protected Apps: Show state by component instead of by app

Change-Id: Idbe1d69b376fc3f42980404d9448152f606e7f8e
(cherry picked from commit 56e11c8640cb9e34d07eb11fb1b67f3283b2f6f6)
Settings: add "Show weather" toggle for status bar

Change-Id: I316eee4fd21f587c033f6fa90558957c3bd58c1d
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I6496990d26a7fef60d4a0208b8ab320845c4337a