Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev
am: c3321c813c

Change-Id: I7934edf2cb6a96edc37877897d0f10565a8d6af5