This reverts commitc9e9058347. This is the original CL, unchanged. The test that was the reason for the rollback now passes, see http://go/forrest-run/L29200000799760670 The reason for the test failure was that Cuttlefish does not define any CPU frequencies, which caused https://android.googlesource.com/platform/frameworks/native/+/refs/changes/65/1558465/2/libs/cputimeinstate/cputimeinstate.cpp#578 to fall into a near-infinite loop, thus locking up BatteryStats. The no-frequencies issue was addressed in https://r.android.com/1558465. Reason for revert: rolling forward since the test failure has been addressed Bug: 169279846 Change-Id: I537561b4c86ef2aaf236b1807b844855fef38f8b (cherry picked from commit4a7792b30c) Merged-In: I537561b4c86ef2aaf236b1807b844855fef38f8b