Merge changes I474cd019,I8d87c1da,I90ebad48 into sc-dev

* changes:
  Make CpuPowerCalculator's Estimators available to com.android.internal
  Implement EnergyConsumer type to ids map for targeted querying
  Add cpu proc file read throttling enabling/disabling