[automerger skipped] Merge "Add systrace tag for RRO" am: 1c018862 am: 047ae057
am: 79d59f0b -s ours
am skip reason: change_id I7b883d107a9ae2b12bbda04b74001a68e2a904aa with SHA1 61e68cb8 is in history
Change-Id: I8f1bec7a78963f1f81b4eb8a13a86bcded93a7f8