Merge "Use QS context when creating the bluetooth battery indicator" into oc-mr1-dev am: 69e9500606
am: fa7f4259ab

Change-Id: I5999839e2b228ce2fd8097f771917a2d2f499ba2