Merge "simpleperf: enforce clockid support in Android Q."
am: 8d81763715

Change-Id: Iec5fb44da069fe38968ccc5e91893091e2329d89