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

* commit 'c443a1d2f541578b6aeecf57eaa6fcf26964d164':
  21560057: Don't enable rs tag by default in systrace options.