Merge "Optionally holds a wakelock while collecting perfetto traces on...
Merge "Optionally holds a wakelock while collecting perfetto traces on onTestRunStart, onTestStart, onTestEnd, onTestRunEnd, depending on which ones are enabled." into qt-dev am: 8ae97914
am: 952e030e
Change-Id: Ic4ca58427bd4464736d4b8a68c6d4c12621797fe