Merge "Fix inaccuracies in BatterySaverPolicy cache invalidation" into rvc-dev