Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo"
tree: e2fe0e9df02b7177418399bf45bc370c14241f99
  1. framework/
  2. service/