Merge "Update filesystem permissions in atrace.rc to give selinux control."
am: bf5e6b1a99

Change-Id: I4c17afb7cf4deea8cf486836c7f676c562f444ec