Merge "expose control over unpriv perf access to shell" into marshmallow-cts-dev