[automerger skipped] Merge "Change stopwatch accuracy from milliseconds to...

[automerger skipped] Merge "Change stopwatch accuracy from milliseconds to microseconds" into rvc-dev am: 59b66b8f -s ours am: 8d884c18 -s ours am: 395d6c5b -s ours am: 931d3f56 -s ours

am skip reason: Change-Id I5a27a3b1316c67bf076b2e490860385267358ef8 with SHA-1 fa914145 is in history

Change-Id: Ib5a53e26c2147ba225f8e67b7b378b4245a37af6