Merge "Revert "simpleperf: enforce clockid support in Android Q.""
am: c4385c91c4

Change-Id: I1f580018eb5f22c116dbf93666cda6f5bfdc16b0