Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into mnc-dev am: 11c84f95fb am: a0c61fc832
am: 3cceebf11e

Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5