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

Change-Id: I55ca66f2cfc3ae91b39548f61825f3647fd88219