Merge "Only add br_edr to power mode db" am: b0c80d64 am: f936fafc

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



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