Fix inaccuracies in BatterySaverPolicy cache invalidation

Subsequent changes to BatterySaverPolicy changed the variables
isBatterySaveMode depends on, causing us to fail to invalidate at the
correct time. This change moves the invalidate to occur alongside the
proper update to state.

Bug: 153712245
Test: built and flashed
Merged-In: Iab981286b321a6e9f235e01a62a3ea7cb13d4133
Change-Id: Iab981286b321a6e9f235e01a62a3ea7cb13d4133
(cherry picked from commit fa7d2f98)