Merge \"Merge \\\"Align bottom text with battery graph in RTL layout.\\\" into nyc-mr1-dev am: 9669f426c7 am: 9007014b8a\" into nyc-mr1-dev-plus-aosp
am: c55137fe0e

Change-Id: I8d95b142583484c4a66c5749a58da670a43ede11