Merge "Use BatteryMeterDrawableBase as QS icon for Battery Saver" into oc-dr1-dev
am: be196018e1

Change-Id: Ib7f8e5e65b353bf03affc557e38d7c4ecd47d0a8