Merge "Revert "simpleperf: enforce clockid support in Android Q."" am: c4385c91c4 am: 89609efff8
am: 88aad2d49d

Change-Id: I90f55c180561c9f9c3a824ff58e845e70fdf4831