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

Change-Id: I6cdbf83f2e413b5b43f9972d591f64ba802cb46f