Merge changes Ia4da8741,Ifbfea9e1,Ice606f9b,I6b4a8e0c into main

* changes:
  Remove flag com.android.server.power.optimization.streamlined_misc_battery_stats
  Ensure tests pass when streamlined_misc_battery_stats flag is enabled
  Remove functional uses of flag com.android.server.power.optimization.streamlined_connectivity_battery_stats
  Remove flag com.android.server.power.optimization.streamlined_battery_stats