Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
am: 75e89dfede
am: 418bd11db3
Change-Id: I73a01ad35316be7c6d66f05ba312a5c432558d3b
This commit is contained in: