Merge "Migrate BatteryStats audio calls to oneway" into main