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

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

Change-Id: I876b137606e9997a3975252b6c6e725d85459854