Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo"