Merge "traced_perf sepolicy tweaks"