Merge "Merge "Add bt battery level to QS icons" into oc-mr1-dev am: 984b76f62e am: 1064389310"