Merge "Add systrace tag for RRO"
am: 1c018862a0

Change-Id: I5140576cd7661423736de702eb0b5c45a7f56484