Add back privacy guard manager.

Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709
Settings : Switch state fix

Since the switch views are shared, we need to recreate them
in order to prevent from being reused as they don't share state.

Change-Id: I4d7038f37883e1791c8c2b0009f0adb85ebb2b88
Port "Option to hide Adb notification icon"

Frameworks part is already in place

Change-Id: I7c50e50be86c654c77d6c2a385860d97279ed621
Merge remote-tracking branch 'cm/cm-11.0' into wszf