Merge "Settings: privacy Guard enhance app logic" into cm-10.1

Change-Id: Id6c6fea3acf4691b1ac3fc698406e8809906e697