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

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

Change-Id: Ic5f6cb5507e747f570cc273d40fd843772069482