[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 skip reason: Change-Id I5a27a3b1316c67bf076b2e490860385267358ef8 with SHA-1 a28c41c0 is in history
Change-Id: I367d185419083469ee576155fc472090b35b89bc