Merge "Merge "Bluetooth: Display battery level of connected devices am: 6258aae548" into oc-dr1-dev-plus-aosp am: f72404a026"