Merge "expose control over unpriv perf access to shell am: 7005e25e am: c66f13af" into nyc-mr1-dev-plus-aosp