Merge "Fix CpuThrottlingWaiter cat failures am: 76a718e081 am: 12fa2d7f63" into nyc-mr1-dev-plus-aosp