Merge \"Update QS battery trendline to use theme color.\" into nyc-mr1-dev
am: 3d29644f28

Change-Id: I05814fb1551543294aa3bf0b254d0d5e17ff417e