[automerger skipped] Merge "Add BluetoothActivityEnergyInfoTest" into...

[automerger skipped] Merge "Add BluetoothActivityEnergyInfoTest" into tm-qpr-dev am: 4f8bf0d4 -s ours am: 08062031 -s ours

am skip reason: Merged-In I2f0379b1fcc30fe3e63809a91b3c418dfcec7d84 with SHA-1 1eb6b0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20605671



Change-Id: I7279461c69b3324929278c1de03f57e9126c7fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>