Merge "21560057: Don\'t enable rs tag by default in systrace options." into...
Merge "21560057: Don\'t enable rs tag by default in systrace options." into studio-1.3-dev automerge: 67188db9
automerge: c443a1d2
* commit 'c443a1d2':
21560057: Don't enable rs tag by default in systrace options.