Merge "Add BottomLabelLayout for battery graph" into oc-dev am: 9e6519c7e1
am: 4ca9c05994

Change-Id: If4326e4fbf88b54bbe54b8d9c38d9f04b37c77a3