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

Change-Id: I88202e9d06e60f8862aa4b32c8df6c981a89c3f7