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