Merge "Change battery icon to the side of bt icon" into oc-mr1-dev
am: a57aea0d61

Change-Id: I1aa4703f4d5fb110c0b4261cc091ba8dbfc5e5f1