Merge \"Align bottom text with battery graph in RTL layout. am: dd5469e4 am:...
Merge \"Align bottom text with battery graph in RTL layout. am: dd5469e4 am: da61face\" into nyc-mr1-dev-plus-aosp
am: 1635b9e6
Change-Id: I97ae3c7cdd372d6ceb606b1110cdb4109e8d9455