Merge "BT_MAINLINE Delete getControllerActivityEnergyInfo" am: 4045c6f336 am: a74b7f7406 am: 8dd67f3e31

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

Change-Id: I393a6820be537ba580b4aa260d93f48f997358ba