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

Change-Id: If156c3f183fa4efa489202ef90b75ce758ff5b16