[automerger skipped] Merge "Add permissions for sync and fence tracepoints on user builds." am: 395b0a586f am: fe2abbdbb5  -s ours
am: 19a61a3b2f  -s ours

Change-Id: Ia5d3664d6a53a0af207b112e9b4c5879d5cb430d