Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo" am: 4045c6f336

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1896735

Change-Id: I079814137b2d994c059ac0f2ae7f1b7217ebbdde