Merge "Merge "Update battery saver colors to make them more obvious" into pi-dev am: 3dc91c1426" into pi-dev-plus-aosp
am: dcbe9af9be

Change-Id: I3566eb3240a953c0a8e6dff48b3b8923bee68d45