Merge "Add AOD to BatterySaverPolicy"