Merge "Use mean CPU time in an attempt to reduce test flakiness" am: 7d06b37270

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1665750

Change-Id: I403bec9c0632e3f81b0310fa67730a75411a38cb